From 0595ddeb0938e9c688d2cb58484383a2becaeadc Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 20 Apr 2006 02:34:02 +0000 Subject: [PATCH] More Jeeps rework commits. With this in place, it all builds. --- gpsbabel/Makefile.in | 4 +++- gpsbabel/brauniger_iq.c | 2 ++ gpsbabel/garmin.c | 6 ++--- gpsbabel/jeeps/gpsserial.c | 45 -------------------------------------- 4 files changed, 8 insertions(+), 49 deletions(-) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 6f9cbc6fb..63abbd185 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -56,8 +56,10 @@ FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o \ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ jeeps/gpsmath.o jeeps/gpsmem.o \ jeeps/gpsprot.o jeeps/gpsread.o \ + jeeps/gpsdevice.o jeeps/gpsdevice_ser.o jeeps/gpsdevice_usb.o \ jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/gpsutil.o \ - jeeps/gpsusbread.o jeeps/gpsusbsend.o @OSJEEPS@ + jeeps/gpsusbread.o jeeps/gpsusbsend.o \ + jeeps/gpsusbcommon.o @OSJEEPS@ # Extra modules in Jeeps that we don't use # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o diff --git a/gpsbabel/brauniger_iq.c b/gpsbabel/brauniger_iq.c index 8026d9795..003edeb9b 100644 --- a/gpsbabel/brauniger_iq.c +++ b/gpsbabel/brauniger_iq.c @@ -27,6 +27,8 @@ static char *port; #define MYNAME "BRAUNIGER-IQ" #define PRESTRKNAME "PRESALTTRK" +#define GPS_Serial_On(a, b) 0 +#define GPS_Serial_Off(a, b) 0 static enum { st_sync, diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c index f960bdfbf..2b5b76a2c 100644 --- a/gpsbabel/garmin.c +++ b/gpsbabel/garmin.c @@ -244,8 +244,8 @@ waypt_read(void) } else { wpt_tmp->altitude = way[i]->alt; } - if (way[i]->Time_populated) - wpt_tmp->creation_time = way[i]->Time; + if (way[i]->time_populated) + wpt_tmp->creation_time = way[i]->time; waypt_add(wpt_tmp); GPS_Way_Del(&way[i]); @@ -528,7 +528,7 @@ waypoint_write(void) } else { way[i]->alt = wpt->altitude; } - way[i]->Time = wpt->creation_time; + way[i]->time = wpt->creation_time; i++; } diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.c index 3e586e6d3..cfc977054 100644 --- a/gpsbabel/jeeps/gpsserial.c +++ b/gpsbabel/jeeps/gpsserial.c @@ -229,51 +229,6 @@ typedef struct { struct termios gps_ttysave; } posix_serial_data; -/* @func GPS_Serial_Restoretty *********************************************** -** -** Save tty information for the serial post to be used -** -** @param [r] port [const char *] port e.g. ttyS1 -** -** @return [int32] false upon error -************************************************************************/ - -static int32 GPS_Serial_Savetty(int32 fd) -{ - if(tcgetattr(fd,&gps_ttysave)==-1) - { - gps_errno = HARDWARE_ERROR; - GPS_Serial_Error("SERIAL: tcgetattr error"); - return 0; - } - - return 1; -} - - -/* @func GPS_Serial_Restoretty *********************************************** -** -** Restore serial post to condition before AJBGPS called -** -** @param [r] port [const char *] port e.g. ttyS1 -** -** @return [int32] false upon error -************************************************************************/ - -static int32 GPS_Serial_Restoretty(int fd) -{ - if(tcsetattr(fd, TCSAFLUSH, &gps_ttysave)==-1) - { - gps_errno = HARDWARE_ERROR; - GPS_Serial_Error("SERIAL: tcsetattr error"); - return 0; - } - - return 1; -} - -#endif - /* @func GPS_Serial_Open *********************************************** ** ** Open a serial port 8bits 1 stop bit 9600 baud -- 2.30.2